From dc2ff4c74341a46eefabf08b6d080a5e2a7b7201 Mon Sep 17 00:00:00 2001
From: "mjw@wray-m-3.hpl.hp.com" <mjw@wray-m-3.hpl.hp.com>
Date: Fri, 2 Jul 2004 09:32:24 +0000
Subject: [PATCH] bitkeeper revision 1.1041.3.4
 (40e52ba8BG52Ja01pk085Hoa4GWGqQ)

Fix headers.
---
 tools/libxutil/Makefile        | 2 +-
 tools/libxutil/allocate.h      | 6 +++---
 tools/libxutil/debug.h         | 6 +++---
 tools/libxutil/file_stream.h   | 6 +++---
 tools/libxutil/gzip_stream.c   | 1 -
 tools/libxutil/gzip_stream.h   | 7 +++----
 tools/libxutil/kernel_stream.h | 6 +++---
 tools/libxutil/string_stream.h | 7 +++----
 tools/libxutil/sys_ctype.h     | 6 +++---
 tools/libxutil/sys_net.h       | 6 +++---
 tools/libxutil/sys_string.h    | 6 +++---
 11 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/tools/libxutil/Makefile b/tools/libxutil/Makefile
index 8ba9eb3454..8be24daa92 100644
--- a/tools/libxutil/Makefile
+++ b/tools/libxutil/Makefile
@@ -8,7 +8,7 @@ LIB_SRCS += allocate.c
 LIB_SRCS += file_stream.c
 LIB_SRCS += gzip_stream.c
 LIB_SRCS += iostream.c
-LIB_SRCS += sys_net.c
+#LIB_SRCS += sys_net.c
 LIB_SRCS += sys_string.c
 
 LIB_OBJS := $(LIB_SRCS:.c=.o)
diff --git a/tools/libxutil/allocate.h b/tools/libxutil/allocate.h
index 08bc67b910..391b7be2bd 100644
--- a/tools/libxutil/allocate.h
+++ b/tools/libxutil/allocate.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _XEN_LIB_ALLOCATE_H_
-#define _XEN_LIB_ALLOCATE_H_
+#ifndef _XUTIL_ALLOCATE_H_
+#define _XUTIL_ALLOCATE_H_
 
 /** Allocate memory for a given type, and cast. */
 #define ALLOCATE(ctype) (ctype *)allocate(sizeof(ctype))
@@ -33,7 +33,7 @@ extern void memzero(void *p, int size);
 typedef void AllocateFailedFn(int size, int type);
 extern AllocateFailedFn *allocate_failed_fn;
 
-#endif /* _XEN_LIB_ALLOCATE_H_ */
+#endif /* _XUTIL_ALLOCATE_H_ */
 
 
 
diff --git a/tools/libxutil/debug.h b/tools/libxutil/debug.h
index 4f5228faa3..69a6b49937 100644
--- a/tools/libxutil/debug.h
+++ b/tools/libxutil/debug.h
@@ -15,8 +15,8 @@
  * along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef _XEN_LIB_DEBUG_H_
-#define _XEN_LIB_DEBUG_H_
+#ifndef _XUTIL_DEBUG_H_
+#define _XUTIL_DEBUG_H_
 
 #ifndef MODULE_NAME
 #define MODULE_NAME ""
@@ -69,4 +69,4 @@
  */
 #define IPFMT "%u.%u.%u.%u"
 
-#endif /* ! _XEN_LIB_DEBUG_H_ */
+#endif /* ! _XUTIL_DEBUG_H_ */
diff --git a/tools/libxutil/file_stream.h b/tools/libxutil/file_stream.h
index 36a0f928b2..f717656c24 100644
--- a/tools/libxutil/file_stream.h
+++ b/tools/libxutil/file_stream.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _XEN_LIB_FILE_STREAM_H_
-#define _XEN_LIB_FILE_STREAM_H_
+#ifndef _XUTIL_FILE_STREAM_H_
+#define _XUTIL_FILE_STREAM_H_
 
 #ifndef __KERNEL__
 #include "iostream.h"
@@ -32,4 +32,4 @@ extern IOStream get_stream_stdin(void);
 
 extern int file_stream_setvbuf(IOStream *io, char *buf, int mode, size_t size);
 #endif
-#endif /* !_XEN_LIB_FILE_STREAM_H_ */
+#endif /* !_XUTIL_FILE_STREAM_H_ */
diff --git a/tools/libxutil/gzip_stream.c b/tools/libxutil/gzip_stream.c
index af46023f9d..a933c5ff73 100644
--- a/tools/libxutil/gzip_stream.c
+++ b/tools/libxutil/gzip_stream.c
@@ -1,4 +1,3 @@
-/* $Id: gzip_stream.c,v 1.4 2003/09/30 15:22:53 mjw Exp $ */
 /*
  * Copyright (C) 2003 Hewlett-Packard Company.
  *
diff --git a/tools/libxutil/gzip_stream.h b/tools/libxutil/gzip_stream.h
index cf76d25275..fd28e39575 100644
--- a/tools/libxutil/gzip_stream.h
+++ b/tools/libxutil/gzip_stream.h
@@ -1,4 +1,3 @@
-#/* $Id: gzip_stream.h,v 1.3 2003/09/30 15:22:53 mjw Exp $ */
 /*
  * Copyright (C) 2003 Hewlett-Packard Company.
  *
@@ -17,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _SP_GZIP_STREAM_H_
-#define _SP_GZIP_STREAM_H_
+#ifndef _XUTIL_GZIP_STREAM_H_
+#define _XUTIL_GZIP_STREAM_H_
 
 #ifndef __KERNEL__
 #include "iostream.h"
@@ -28,4 +27,4 @@ extern IOStream *gzip_stream_new(gzFile *f);
 extern IOStream *gzip_stream_fopen(const char *file, const char *flags);
 extern IOStream *gzip_stream_fdopen(int fd, const char *flags);
 #endif
-#endif /* !_SP_FILE_STREAM_H_ */
+#endif /* !_XUTIL_GZIP_STREAM_H_ */
diff --git a/tools/libxutil/kernel_stream.h b/tools/libxutil/kernel_stream.h
index be370f2a45..0f18058d59 100644
--- a/tools/libxutil/kernel_stream.h
+++ b/tools/libxutil/kernel_stream.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _XEN_LIB_KERNEL_STREAM_H_
-#define _XEN_LIB_KERNEL_STREAM_H_
+#ifndef _XUTIL_KERNEL_STREAM_H_
+#define _XUTIL_KERNEL_STREAM_H_
 
 #ifdef __KERNEL__
 #include "iostream.h"
@@ -26,4 +26,4 @@ extern IOStream get_stream_kernel(void);
 #define get_stream_stdout get_stream_kernel
 
 #endif /* __KERNEL__ */
-#endif /* !_XEN_LIB_KERNEL_STREAM_H_ */
+#endif /* !_XUTIL_KERNEL_STREAM_H_ */
diff --git a/tools/libxutil/string_stream.h b/tools/libxutil/string_stream.h
index 36d764b265..b6cbc0f3df 100644
--- a/tools/libxutil/string_stream.h
+++ b/tools/libxutil/string_stream.h
@@ -1,4 +1,3 @@
-/* $Id: string_stream.h,v 1.1 2003/08/22 14:25:48 mjw Exp $ */
 /*
  * Copyright (C) 2001, 2002 Hewlett-Packard Company.
  *
@@ -17,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _SP_STRING_STREAM_H_
-#define _SP_STRING_STREAM_H_
+#ifndef _XUTIL_STRING_STREAM_H_
+#define _XUTIL_STRING_STREAM_H_
 
 #include "iostream.h"
 
@@ -43,4 +42,4 @@ extern IOMethods *string_stream_get_methods(void);
 extern IOStream *string_stream_new(char *s, int n);
 extern void string_stream_init(IOStream *stream, StringData *data, char *s, int n);
 
-#endif /* !_SP_STRING_STREAM_H_ */
+#endif /* !_XUTIL_STRING_STREAM_H_ */
diff --git a/tools/libxutil/sys_ctype.h b/tools/libxutil/sys_ctype.h
index 1dc6cf2fac..debcc8921b 100644
--- a/tools/libxutil/sys_ctype.h
+++ b/tools/libxutil/sys_ctype.h
@@ -1,5 +1,5 @@
-#ifndef _XENO_SYS_CTYPE_H_
-#define _XENO_SYS_CTYPE_H_
+#ifndef _XUTIL_SYS_CTYPE_H_
+#define _XUTIL_SYS_CTYPE_H_
 /** @file
  ** Replacement for ctype include that can be used
  * from user or kernel code.
@@ -9,4 +9,4 @@
 #else
 #  include <ctype.h>
 #endif
-#endif /* ! _XENO_SYS_CTYPE_H_ */
+#endif /* ! _XUTIL_SYS_CTYPE_H_ */
diff --git a/tools/libxutil/sys_net.h b/tools/libxutil/sys_net.h
index da6c1e8fd5..61754940f2 100644
--- a/tools/libxutil/sys_net.h
+++ b/tools/libxutil/sys_net.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _XEN_LIB_SYS_NET_H_
-#define _XEN_LIB_SYS_NET_H_
+#ifndef _XUTIL_SYS_NET_H_
+#define _XUTIL_SYS_NET_H_
 /** @file
  *
  * Replacement for standard network includes.
@@ -72,7 +72,7 @@ extern int inet_aton(const char *address, struct in_addr *inp);
 extern char *mac_ntoa(const unsigned char *macaddr);
 extern int mac_aton(const char *addr, unsigned char *macaddr);
 
-#endif /* !_SP_SYS_NET_H_ */
+#endif /* !_XUTIL_SYS_NET_H_ */
 
 
 
diff --git a/tools/libxutil/sys_string.h b/tools/libxutil/sys_string.h
index f39935f669..ea60401168 100644
--- a/tools/libxutil/sys_string.h
+++ b/tools/libxutil/sys_string.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _XEN_LIB_SYS_STRING_H_
-#define _XEN_LIB_SYS_STRING_H_
+#ifndef _XUTIL_SYS_STRING_H_
+#define _XUTIL_SYS_STRING_H_
 /** @file
  * Replacement for standard string includes.
  * Works in user or kernel code.
@@ -88,4 +88,4 @@ static inline size_t strnlen(const char *s, size_t n){
 extern int convert_atoul(const char *s, unsigned long *v);
 extern int path_concat(char *s, char *t, char **val);
 
-#endif /* !_XEN_LIB_SYS_STRING_H_ */
+#endif /* !_XUTIL_SYS_STRING_H_ */
-- 
2.30.2